From eb51d9886060ec2574357cd401cf651d11622915 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Thu, 12 Jul 2018 15:46:38 -0600 Subject: [PATCH] obsolete jeeps/gpsproj.h. Note that jeeps/gpsproj.cc is not used. Historically some routines have been copied from gpsproj.cc to gpsmath.cc. When/If this is done the corresponding headers from gpsproj.h should be copied to gpsmath.h. --- .codacy.yaml | 2 + CMakeLists.txt | 1 - GPSBabel.pro | 1 - Makefile.in | 101 ++-- jeeps/gps.h | 1 - jeeps/gpsmath.h | 7 + msvc/GPSBabel.sln | 22 +- msvc/GPSBabel.vcxproj | 720 +++++++++++++++------------ msvc/GPSBabel.vcxproj.filters | 896 ++++++++++++++++++++++++++++++++++ msvc/README.msvc | 10 + msvc/config.h | 25 - 11 files changed, 1382 insertions(+), 404 deletions(-) create mode 100755 msvc/GPSBabel.vcxproj.filters delete mode 100644 msvc/config.h diff --git a/.codacy.yaml b/.codacy.yaml index f18708f18..a9c92549d 100644 --- a/.codacy.yaml +++ b/.codacy.yaml @@ -5,3 +5,5 @@ exclude_paths: - 'zlib/**' - coverity_model.cc - strptime.[ch] + - jeeps/gpsproj.cc + - jeeps/gpsproj.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 8513b0565..0acdc0ba0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,6 @@ set(HEADERS jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsport.h - jeeps/gpsproj.h jeeps/gpsprot.h jeeps/gpsread.h jeeps/gpsrqst.h diff --git a/GPSBabel.pro b/GPSBabel.pro index d9cc6b851..9d9b32e67 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -118,7 +118,6 @@ HEADERS = \ jeeps/gpsmath.h \ jeeps/gpsmem.h \ jeeps/gpsport.h \ - jeeps/gpsproj.h \ jeeps/gpsprot.h \ jeeps/gpsread.h \ jeeps/gpsrqst.h \ diff --git a/Makefile.in b/Makefile.in index 7e85c9c41..9decf2320 100644 --- a/Makefile.in +++ b/Makefile.in @@ -479,8 +479,8 @@ csv_util.o: csv_util.cc csv_util.h queue.h defs.h config.h zlib/zlib.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h grtcirc.h \ - jeeps/gpsmath.h src/core/logging.h strptime.h xcsv_tokens.gperf + jeeps/gpsrqst.h grtcirc.h jeeps/gpsmath.h src/core/logging.h strptime.h \ + xcsv_tokens.gperf delgpl.o: delgpl.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h destinator.o: destinator.cc defs.h config.h queue.h zlib/zlib.h \ @@ -489,7 +489,7 @@ destinator.o: destinator.cc defs.h config.h queue.h zlib/zlib.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h strptime.h + jeeps/gpsrqst.h strptime.h dg-100.o: dg-100.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h discard.o: discard.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ @@ -521,11 +521,10 @@ fatal.o: fatal.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h filter_vecs.o: filter_vecs.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h config.h gbfile.h cet.h inifile.h session.h \ - src/core/datetime.h arcdist.h filter.h filterdefs.h grtcirc.h bend.h \ - discard.h duplicate.h height.h interpolate.h nukedata.h polygon.h \ - position.h radius.h reverse_route.h smplrout.h sort.h stackfilter.h \ - swapdata.h trackfilter.h strptime.h xmlgeneric.h transform.h validate.h \ - gbversion.h + src/core/datetime.h arcdist.h filter.h bend.h discard.h duplicate.h \ + filterdefs.h height.h interpolate.h nukedata.h polygon.h position.h \ + radius.h reverse_route.h smplrout.h sort.h stackfilter.h swapdata.h \ + trackfilter.h transform.h validate.h gbversion.h formspec.o: formspec.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h g7towin.o: g7towin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ @@ -534,16 +533,14 @@ g7towin.o: g7towin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h garmin_tables.h \ - jeeps/gpsmath.h strptime.h + jeeps/gpsrqst.h garmin_tables.h jeeps/gpsmath.h strptime.h garmin.o: garmin.cc cet_util.h config.h cet.h defs.h queue.h zlib/zlib.h \ zlib/zconf.h config.h gbfile.h inifile.h session.h src/core/datetime.h \ garmin_device_xml.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h garmin_tables.h \ - grtcirc.h jeeps/gpsserial.h + jeeps/gpsrqst.h garmin_tables.h grtcirc.h jeeps/gpsserial.h garmin_device_xml.o: garmin_device_xml.cc defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h config.h gbfile.h cet.h inifile.h session.h \ src/core/datetime.h garmin_device_xml.h xmlgeneric.h @@ -556,15 +553,14 @@ garmin_fs.o: garmin_fs.cc defs.h config.h queue.h zlib/zlib.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h garmin_tables.h + jeeps/gpsrqst.h garmin_tables.h garmin_gpi.o: garmin_gpi.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h config.h gbfile.h cet.h inifile.h session.h \ src/core/datetime.h cet_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h garmin_gpi.h \ - jeeps/gpsmath.h + jeeps/gpsrqst.h garmin_gpi.h jeeps/gpsmath.h garmin_tables.o: garmin_tables.cc garmin_tables.h defs.h config.h queue.h \ zlib/zlib.h zlib/zconf.h config.h gbfile.h cet.h inifile.h session.h \ src/core/datetime.h jeeps/gpsmath.h jeeps/gpsport.h src/core/logging.h @@ -574,8 +570,8 @@ garmin_txt.o: garmin_txt.cc defs.h config.h queue.h zlib/zlib.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ - jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsproj.h \ - garmin_tables.h grtcirc.h jeeps/gpsmath.h strptime.h + jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h grtcirc.h jeeps/gpsmath.h \ + strptime.h garmin_xt.o: garmin_xt.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h config.h gbfile.h cet.h inifile.h session.h \ src/core/datetime.h @@ -595,8 +591,7 @@ gdb.o: gdb.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h garmin_tables.h grtcirc.h \ - jeeps/gpsmath.h + garmin_tables.h grtcirc.h jeeps/gpsmath.h geo.o: geo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h config.h \ gbfile.h cet.h inifile.h session.h src/core/datetime.h src/core/file.h \ defs.h @@ -640,8 +635,8 @@ gpx.o: gpx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h garmin_tables.h src/core/file.h defs.h \ - src/core/logging.h src/core/xmlstreamwriter.h src/core/xmltag.h + garmin_tables.h src/core/file.h defs.h src/core/logging.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h grtcirc.o: grtcirc.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \ grtcirc.h @@ -690,40 +685,37 @@ jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsserial.h jeeps/gpsusbint.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsserial.h jeeps/gpsusbint.h jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/gpsserial.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/gpsserial.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h jeeps/gpsusbint.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbcommon.h jeeps/gpsusbint.h jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h jeeps/gps.h \ jeeps/../defs.h jeeps/../config.h jeeps/../queue.h zlib/zlib.h \ zlib/zconf.h jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h \ @@ -731,72 +723,65 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h jeeps/gps.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h \ - jeeps/../garmin_device_xml.h + jeeps/garminusb.h jeeps/gpsusbcommon.h jeeps/../garmin_device_xml.h jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/gpsdatum.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsdatum.h jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/gpsserial.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/gpsserial.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/../gbser.h jeeps/gpsserial.h gbser_posix.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/../gbser.h \ + jeeps/gpsserial.h gbser_posix.h jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbcommon.h jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/garminusb.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/../defs.h jeeps/../config.h \ jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h jeeps/../gbfile.h \ @@ -804,23 +789,22 @@ jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/garminusb.h \ jeeps/../src/core/datetime.h jeeps/gpsport.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h jeeps/gpsusbint.h + jeeps/gpsrqst.h jeeps/gpsusbint.h jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbint.h jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h zlib/zlib.h zlib/zconf.h config.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../inifile.h \ jeeps/../session.h jeeps/../src/core/datetime.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jogmap.o: jogmap.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \ garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h @@ -938,7 +922,7 @@ random.o: random.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h jeeps/gpsmath.h + jeeps/gpsmath.h raymarine.o: raymarine.cc defs.h config.h queue.h zlib/zlib.h \ zlib/zconf.h config.h gbfile.h cet.h inifile.h session.h \ src/core/datetime.h cet_util.h csv_util.h @@ -1034,8 +1018,7 @@ unicsv.o: unicsv.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsproj.h garmin_tables.h \ - jeeps/gpsmath.h src/core/logging.h + jeeps/gpsrqst.h garmin_tables.h jeeps/gpsmath.h src/core/logging.h units.o: units.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h util.o: util.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h config.h \ @@ -1067,8 +1050,8 @@ waypt.o: waypt.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ cet_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ - jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/gpsproj.h grtcirc.h src/core/logging.h + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h grtcirc.h \ + src/core/logging.h wbt-200.o: wbt-200.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ config.h gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h \ grtcirc.h diff --git a/jeeps/gps.h b/jeeps/gps.h index 7921f2559..b517a901e 100644 --- a/jeeps/gps.h +++ b/jeeps/gps.h @@ -263,7 +263,6 @@ typedef int (*pcb_fn)(int, struct GPS_SWay**); #include "gpsmath.h" #include "gpsmem.h" #include "gpsrqst.h" -#include "gpsproj.h" extern time_t gps_save_time; extern double gps_save_lat; diff --git a/jeeps/gpsmath.h b/jeeps/gpsmath.h index 4da0d6905..3a555ce88 100644 --- a/jeeps/gpsmath.h +++ b/jeeps/gpsmath.h @@ -122,6 +122,13 @@ double* lambda, double phi0, double lambda0, double E0, double N0, double a, double b); + void GPS_Math_Cassini_LatLon_To_EN(double phi, double lambda, double* E, + double* N, double phi0, double M0, + double E0, double N0, double a, double b); + void GPS_Math_Cassini_EN_To_LatLon(double E, double N, double* phi, + double* lambda, double phi0, double M0, + double E0, double N0, double a, double b); + int32 GPS_Math_WGS84_To_ICS_EN(double lat, double lon, double* E, double* N); void GPS_Math_ICS_EN_To_WGS84(double E, double N, double* lat, double* lon); diff --git a/msvc/GPSBabel.sln b/msvc/GPSBabel.sln index 36412639e..6dd75ef3f 100644 --- a/msvc/GPSBabel.sln +++ b/msvc/GPSBabel.sln @@ -1,19 +1,25 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPSBabel", "GPSBabel.vcxproj", "{588699A5-B1C9-4343-B765-23B4C0837435}" +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2042 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPSBabel", "GPSBabel.vcxproj", "{CFC0F0AD-9E1E-38C1-852A-BDF085ED75EA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {588699A5-B1C9-4343-B765-23B4C0837435}.Debug|Win32.ActiveCfg = Debug|Win32 - {588699A5-B1C9-4343-B765-23B4C0837435}.Debug|Win32.Build.0 = Debug|Win32 - {588699A5-B1C9-4343-B765-23B4C0837435}.Release|Win32.ActiveCfg = Release|Win32 - {588699A5-B1C9-4343-B765-23B4C0837435}.Release|Win32.Build.0 = Release|Win32 + {CFC0F0AD-9E1E-38C1-852A-BDF085ED75EA}.Debug|x86.ActiveCfg = Debug|Win32 + {CFC0F0AD-9E1E-38C1-852A-BDF085ED75EA}.Debug|x86.Build.0 = Debug|Win32 + {CFC0F0AD-9E1E-38C1-852A-BDF085ED75EA}.Release|x86.ActiveCfg = Release|Win32 + {CFC0F0AD-9E1E-38C1-852A-BDF085ED75EA}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E55B533A-E87A-4373-A52C-8C4FEE2CD81C} + EndGlobalSection EndGlobal diff --git a/msvc/GPSBabel.vcxproj b/msvc/GPSBabel.vcxproj index c14952e7f..c8f6dd09a 100644 --- a/msvc/GPSBabel.vcxproj +++ b/msvc/GPSBabel.vcxproj @@ -1,346 +1,448 @@ - - + + - - Debug - Win32 - Release Win32 + + Debug + Win32 + - {588699A5-B1C9-4343-B765-23B4C0837435} + {CFC0F0AD-9E1E-38C1-852A-BDF085ED75EA} GPSBabel - Application - v110 - false + Qt4VSv1.0 + + v140 + release\ + false + NotSet + Application + release\ + GPSBabel + + + v140 + debug\ + false + NotSet + Application + debug\ + GPSBabel + - + + + - - + + - <_ProjectFileVersion>11.0.60610.1 - C:\Qt\5.1.0\msvc2012\lib;$(LibraryPath) - C:\Qt\5.1.0\msvc2012\include;$(IncludePath) - .\$(Configuration)\ - .\$(Configuration)\ + release\ + release\ + GPSBabel + true + false + debug\ + debug\ + GPSBabel + true - - - .\$(Configuration)/GPSBabel.tlb - - + - -Zm200 -w34100 -w34189 %(AdditionalOptions) - Level3 - false - true - ProgramDatabase - Default - Prompt + .;zlib;C:\Qt\5.9.6\msvc2015\include;C:\Qt\5.9.6\msvc2015\include\QtCore;release;C:\Qt\5.9.6\msvc2015\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + release\ + false + None + 4100;4577;4467;%(DisableSpecificWarnings) + Sync true - - .\$(Configuration)/GPSBabel.pch - .\$(Configuration)/ - .\$(Configuration)/ - .\$(Configuration)/ + release\ + MaxSpeed + _CONSOLE;_UNICODE;WIN32;__WIN32__;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NEW_STRINGS;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_NO_DEBUG;QT_CORE_LIB;NDEBUG;%(PreprocessorDefinitions) + false + + MultiThreadedDLL + true + true + Level3 - - 0x0409 - - setupapi.lib;hid.lib;qt5cored.lib;%(AdditionalDependencies) - "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) - true - true - true - Console - true + setupapi.lib;C:\Qt\5.9.6\msvc2015\lib\Qt5Core.lib;%(AdditionalDependencies) + C:\Qt\5.9.6\msvc2015\lib;%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true - MachineX86 - .\$(Configuration)/GPSBabel.exe - .\$(Configuration)/GPSBabel.pdb + false + true + false + $(OutDir)\GPSBabel.exe + true + Console + true - - - - Disabled - EnableFastChecks - MultiThreadedDebugDLL - _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions) - + + Unsigned + None + 0 + - _DEBUG;%(PreprocessorDefinitions) + _CONSOLE;_UNICODE;WIN32;__WIN32__;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NEW_STRINGS;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_NO_DEBUG;QT_CORE_LIB;%(PreprocessorDefinitions) - + - Full - OnlyExplicitInline - false - Size - true - _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions) + .;zlib;C:\Qt\5.9.6\msvc2015\include;C:\Qt\5.9.6\msvc2015\include\QtCore;debug;C:\Qt\5.9.6\msvc2015\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + debug\ + false + ProgramDatabase + 4100;4577;4467;%(DisableSpecificWarnings) + Sync + true + debug\ + Disabled + _CONSOLE;_UNICODE;WIN32;__WIN32__;_CONSOLE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;NEW_STRINGS;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions) + false + MultiThreadedDebugDLL + true + true + Level3 + + setupapi.lib;C:\Qt\5.9.6\msvc2015\lib\Qt5Cored.lib;%(AdditionalDependencies) + C:\Qt\5.9.6\msvc2015\lib;%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + true + true + $(OutDir)\GPSBabel.exe + true + Console + true + + + Unsigned + None + 0 + - NDEBUG;%(PreprocessorDefinitions) + _CONSOLE;_UNICODE;WIN32;__WIN32__;_CONSOLE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;NEW_STRINGS;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + Document + true + C:\Qt\5.9.6\msvc2015\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxC:\Qt\5.9.6\msvc2015\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew /MP -wd4100 -Zi -MDd -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E C:\Qt\5.9.6\msvc2015\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h + Generate moc_predefs.h + debug\moc_predefs.h;%(Outputs) + + + Document + C:\Qt\5.9.6\msvc2015\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxC:\Qt\5.9.6\msvc2015\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew /MP -wd4100 -O2 -MD -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E C:\Qt\5.9.6\msvc2015\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h + Generate moc_predefs.h + release\moc_predefs.h;%(Outputs) + true + - - - + + \ No newline at end of file diff --git a/msvc/GPSBabel.vcxproj.filters b/msvc/GPSBabel.vcxproj.filters new file mode 100755 index 000000000..60aeef1ea --- /dev/null +++ b/msvc/GPSBabel.vcxproj.filters @@ -0,0 +1,896 @@ + + + + + {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} + cpp;c;cxx;moc;h;def;odl;idl;res; + + + {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} + cpp;c;cxx;moc;h;def;odl;idl;res; + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Generated Files + + + Generated Files + + + \ No newline at end of file diff --git a/msvc/README.msvc b/msvc/README.msvc index a2592592a..000c10094 100644 --- a/msvc/README.msvc +++ b/msvc/README.msvc @@ -1,3 +1,13 @@ +********************************************************************** + THE NOTES BELOW ARE OUT OF DATE + + But here are some hints: + 1. To generate GPSBabel.vcxproj and GPSBabel.vcxproj.filters + qmake -tp vc GPSBabel.pro + 2. To gather all the bits you need including the dlls + use the Qt supplied program windeployoqt, e.g. + windeployqt GPSBabel.exe +********************************************************************** Building GPSBabel on Windows with QtCreator or Microsoft Visual Studio: diff --git a/msvc/config.h b/msvc/config.h deleted file mode 100644 index b5cd673b5..000000000 --- a/msvc/config.h +++ /dev/null @@ -1,25 +0,0 @@ -#if 0 -//This file is no longer used, the defines are set in the project files - -#define __va_copy(ap1, ap2) ((ap1) = (ap2)) - -// This controls the capabilities of our Character Encoding Transformations. -// Undefne for minimal. -// Define to zero for the common UTF-8, ASCII and related sets. -// Define to one for everything we know. - -/* 1 to enable as many formats as possible */ -#define MAXIMAL_ENABLED 1 - -/* 1 to enable the CSV formats support */ -#define CSVFMTS_ENABLED 1 - -/* 1 to enable all the filters. */ -#define FILTERS_ENABLED 1 - -/* 1 to enable shapefile support */ -#define SHAPELIB_ENABLED 1 - -/* 1 to inhibit our use of zlib. */ -#undef ZLIB_INHIBITED -#endif -- 2.30.2